# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1287962436 -7200
# Node ID a19ba5e3e9f06ff5d7f785c3ebea5bf22e67c698
# Parent  7e8dc67bc2a1768431dbb6b987fa76883ff1b58b
Converted the templates to XHTML, fixing &nbsp; entities and fixing
well-formedness issues.
Added some support for SVG-based graphs, requiring additional data from the
graph "command" in hgweb.

diff -r 7e8dc67bc2a1 -r a19ba5e3e9f0 themes/mercurialweb/branches.tmpl
--- a/themes/mercurialweb/branches.tmpl	Fri Jul 16 01:21:02 2010 +0200
+++ b/themes/mercurialweb/branches.tmpl	Mon Oct 25 01:20:36 2010 +0200
@@ -15,7 +15,7 @@
     ><li class="current"><span>Branches</span></li
     ><li><a href="{url}file{sessionvars%urlparameter}">Files</a></li
     ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&nbsp;<input name="rev" id="searchinput" type="text" size="20" />
+        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
       </span>
       {sessionvars%hiddenformentry}
       </form>
diff -r 7e8dc67bc2a1 -r a19ba5e3e9f0 themes/mercurialweb/changelog.tmpl
--- a/themes/mercurialweb/changelog.tmpl	Fri Jul 16 01:21:02 2010 +0200
+++ b/themes/mercurialweb/changelog.tmpl	Mon Oct 25 01:20:36 2010 +0200
@@ -14,7 +14,7 @@
     ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li
     ><li><a href="{url}file{sessionvars%urlparameter}">Files</a></li
     ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&nbsp;<input name="rev" id="searchinput" type="text" size="20" />
+        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
       </span>
       {sessionvars%hiddenformentry}
       </form>
diff -r 7e8dc67bc2a1 -r a19ba5e3e9f0 themes/mercurialweb/changeset.tmpl
--- a/themes/mercurialweb/changeset.tmpl	Fri Jul 16 01:21:02 2010 +0200
+++ b/themes/mercurialweb/changeset.tmpl	Mon Oct 25 01:20:36 2010 +0200
@@ -14,7 +14,7 @@
     ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li
     ><li><a href="{url}file{sessionvars%urlparameter}">Files</a></li
     ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&nbsp;<input name="rev" id="searchinput" type="text" size="20" />
+        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
       </span>
       {sessionvars%hiddenformentry}
       </form>
diff -r 7e8dc67bc2a1 -r a19ba5e3e9f0 themes/mercurialweb/error.tmpl
--- a/themes/mercurialweb/error.tmpl	Fri Jul 16 01:21:02 2010 +0200
+++ b/themes/mercurialweb/error.tmpl	Mon Oct 25 01:20:36 2010 +0200
@@ -14,7 +14,7 @@
     ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li
     ><li><a href="{url}file{sessionvars%urlparameter}">Files</a></li
     ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&nbsp;<input name="rev" id="searchinput" type="text" size="20" />
+        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
       </span>
       {sessionvars%hiddenformentry}
       </form>
diff -r 7e8dc67bc2a1 -r a19ba5e3e9f0 themes/mercurialweb/fileannotate.tmpl
--- a/themes/mercurialweb/fileannotate.tmpl	Fri Jul 16 01:21:02 2010 +0200
+++ b/themes/mercurialweb/fileannotate.tmpl	Mon Oct 25 01:20:36 2010 +0200
@@ -14,7 +14,7 @@
     ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li
     ><li><a href="{url}file{sessionvars%urlparameter}">Files</a></li
     ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&nbsp;<input name="rev" id="searchinput" type="text" size="20" />
+        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
       </span>
       {sessionvars%hiddenformentry}
       </form>
diff -r 7e8dc67bc2a1 -r a19ba5e3e9f0 themes/mercurialweb/filediff.tmpl
--- a/themes/mercurialweb/filediff.tmpl	Fri Jul 16 01:21:02 2010 +0200
+++ b/themes/mercurialweb/filediff.tmpl	Mon Oct 25 01:20:36 2010 +0200
@@ -14,7 +14,7 @@
     ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li
     ><li><a href="{url}file{sessionvars%urlparameter}">Files</a></li
     ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&nbsp;<input name="rev" id="searchinput" type="text" size="20" />
+        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
       </span>
       {sessionvars%hiddenformentry}
       </form>
diff -r 7e8dc67bc2a1 -r a19ba5e3e9f0 themes/mercurialweb/filerevision.tmpl
--- a/themes/mercurialweb/filerevision.tmpl	Fri Jul 16 01:21:02 2010 +0200
+++ b/themes/mercurialweb/filerevision.tmpl	Mon Oct 25 01:20:36 2010 +0200
@@ -14,7 +14,7 @@
     ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li
     ><li><a href="{url}file{sessionvars%urlparameter}">Files</a></li
     ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&nbsp;<input name="rev" id="searchinput" type="text" size="20" />
+        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
       </span>
       {sessionvars%hiddenformentry}
       </form>
diff -r 7e8dc67bc2a1 -r a19ba5e3e9f0 themes/mercurialweb/graph.tmpl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/themes/mercurialweb/graph.tmpl	Mon Oct 25 01:20:36 2010 +0200
@@ -0,0 +1,48 @@
+{header}
+<title>{repo|escape} (graph)</title>
+</head>
+
+<body>
+
+<div id="header">
+  <div id="logo"><a href="{url}..{sessionvars%urlparameter}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div>
+  <div class="controls">
+    <ul id="navibar">
+    <li><a href="{url}summary{sessionvars%urlparameter}">Summary</a></li
+    ><li><a href="{url}shortlog{sessionvars%urlparameter}">Shortlog</a></li
+    ><li><a href="{url}changelog{sessionvars%urlparameter}">Changelog</a></li
+    ><li class="current"><span>Graph</span></li
+    ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li
+    ><li><a href="{url}file{sessionvars%urlparameter}">Files</a></li
+    ><li><form id="searchform" action="{url}log"><span class="container">
+        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
+      </span>
+      {sessionvars%hiddenformentry}
+      </form>
+    </li>
+    </ul>
+  </div>
+  <div id="pageline"></div>
+</div>
+
+<h2>{repo|escape}</h2>
+
+<h3>Graph</h3>
+
+<div class="pager">{changenav%graphpagerlink}</div>
+
+<div class="graph">
+<ul class="graph" style="width:100%; height:{canvasheight}px; padding-left:{canvaswidth}px;">
+{svgdata%graphlabel}
+</ul>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1"
+ style="width:100%; height:{canvasheight}px; position:absolute; top:0; left:0; z-index:-1;">
+<g transform="scale({bg_height}) translate(0.5 0.25)">
+{svgdata%graphnode}
+</g>
+</svg>
+</div>
+
+<div class="pager">{changenav%graphpagerlink}</div>
+
+{footer}
diff -r 7e8dc67bc2a1 -r a19ba5e3e9f0 themes/mercurialweb/graphedge.tmpl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/themes/mercurialweb/graphedge.tmpl	Mon Oct 25 01:20:36 2010 +0200
@@ -0,0 +1,1 @@
+<line x1="{col}" x2="{nextcol}" y1="{row}" y2="{nextrow}" class="graphcolour-{color}" />
diff -r 7e8dc67bc2a1 -r a19ba5e3e9f0 themes/mercurialweb/graphlabel.tmpl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/themes/mercurialweb/graphlabel.tmpl	Mon Oct 25 01:20:36 2010 +0200
@@ -0,0 +1,1 @@
+<li class="graphlabel" style="height:{bg_height}px;"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape}</a> {user} {age} {branches%branchtag}{inbranch%inbranchtag}{tags%tagtag}</li>
diff -r 7e8dc67bc2a1 -r a19ba5e3e9f0 themes/mercurialweb/graphnode.tmpl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/themes/mercurialweb/graphnode.tmpl	Mon Oct 25 01:20:36 2010 +0200
@@ -0,0 +1,2 @@
+<circle cx="{col}" cy="{row}" r="0.25" class="graphcolour-{color}" />
+{edges%graphedge}
diff -r 7e8dc67bc2a1 -r a19ba5e3e9f0 themes/mercurialweb/header.tmpl
--- a/themes/mercurialweb/header.tmpl	Fri Jul 16 01:21:02 2010 +0200
+++ b/themes/mercurialweb/header.tmpl	Mon Oct 25 01:20:36 2010 +0200
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <link rel="icon" href="{staticurl}hgicon.png" type="image/png" />
 <meta name="robots" content="index, nofollow" />
diff -r 7e8dc67bc2a1 -r a19ba5e3e9f0 themes/mercurialweb/index.tmpl
--- a/themes/mercurialweb/index.tmpl	Fri Jul 16 01:21:02 2010 +0200
+++ b/themes/mercurialweb/index.tmpl	Mon Oct 25 01:20:36 2010 +0200
@@ -18,7 +18,7 @@
       <th><a href="?sort={sort_description}">Description</a></th>
       <th><a href="?sort={sort_contact}">Contact</a></th>
       <th><a href="?sort={sort_lastchange}">Last change</a></th>
-      <th>&nbsp;</td>
+      <th>&#160;</th>
     </tr>
   </thead>
   <tbody>
diff -r 7e8dc67bc2a1 -r a19ba5e3e9f0 themes/mercurialweb/manifest.tmpl
--- a/themes/mercurialweb/manifest.tmpl	Fri Jul 16 01:21:02 2010 +0200
+++ b/themes/mercurialweb/manifest.tmpl	Mon Oct 25 01:20:36 2010 +0200
@@ -14,7 +14,7 @@
     ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li
     ><li class="current"><span>Files</span></li
     ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&nbsp;<input name="rev" id="searchinput" type="text" size="20" />
+        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
       </span>
       {sessionvars%hiddenformentry}
       </form>
diff -r 7e8dc67bc2a1 -r a19ba5e3e9f0 themes/mercurialweb/map
--- a/themes/mercurialweb/map	Fri Jul 16 01:21:02 2010 +0200
+++ b/themes/mercurialweb/map	Mon Oct 25 01:20:36 2010 +0200
@@ -1,5 +1,5 @@
 default = 'summary'
-mimetype = 'text/html; charset={encoding}'
+mimetype = 'application/xhtml+xml; charset={encoding}'
 
 branches = branches.tmpl
 changelog = changelog.tmpl
@@ -8,6 +8,7 @@
 fileannotate = fileannotate.tmpl
 filediff = filediff.tmpl
 filerevision = filerevision.tmpl
+graph = graph.tmpl
 header = header.tmpl
 footer = footer.tmpl
 index = index.tmpl
@@ -28,6 +29,10 @@
 shortlogentry = shortlogentry.tmpl
 tagentry = tagentry.tmpl
 
+graphedge = graphedge.tmpl
+graphlabel = graphlabel.tmpl
+graphnode = graphnode.tmpl
+
 archiveentry = '<a href="{url}archive/{node|short}{extension|urlescape}">{type|escape}</a> '
 branchlabel = '<span class="branch">{name}</span> '
 branchtag = '<span class="branch"><a href="{url}rev/{node|short}{sessionvars%urlparameter}#{node|short}">{name}</a></span> '
@@ -36,6 +41,7 @@
 changesetlink = '<a href="{url}rev/{node|short}{sessionvars%urlparameter}">{rev}:{node|short}</a> '
 changesetfiledifflink = '<a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rev}:{node|short}</a> '
 filerevlink = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rev}:{node|short}</a> '
+graphpagerlink = '<a href="{url}graph/{node|short}{sessionvars%urlparameter}#{node|short}">{label|escape}</a> '
 inbranchlabel = '<span class="inbranch">{name}</span> '
 inbranchtag = '<span class="inbranch"><a href="{url}rev/{node|short}{sessionvars%urlparameter}#{node|short}">{name}</a></span> '
 shortlogpagerlink = '<a href="{url}shortlog/{node|short}{sessionvars%urlparameter}#{node|short}">{label|escape}</a> '
diff -r 7e8dc67bc2a1 -r a19ba5e3e9f0 themes/mercurialweb/search.tmpl
--- a/themes/mercurialweb/search.tmpl	Fri Jul 16 01:21:02 2010 +0200
+++ b/themes/mercurialweb/search.tmpl	Mon Oct 25 01:20:36 2010 +0200
@@ -14,7 +14,7 @@
     ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li
     ><li><a href="{url}file{sessionvars%urlparameter}">Files</a></li
     ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&nbsp;<input name="rev" id="searchinput" type="text" size="20" />
+        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
       </span>
       {sessionvars%hiddenformentry}
       </form>
diff -r 7e8dc67bc2a1 -r a19ba5e3e9f0 themes/mercurialweb/shortlog.tmpl
--- a/themes/mercurialweb/shortlog.tmpl	Fri Jul 16 01:21:02 2010 +0200
+++ b/themes/mercurialweb/shortlog.tmpl	Mon Oct 25 01:20:36 2010 +0200
@@ -14,7 +14,7 @@
     ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li
     ><li><a href="{url}file{sessionvars%urlparameter}">Files</a></li
     ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&nbsp;<input name="rev" id="searchinput" type="text" size="20" />
+        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
       </span>
       {sessionvars%hiddenformentry}
       </form>
diff -r 7e8dc67bc2a1 -r a19ba5e3e9f0 themes/mercurialweb/static/style-mercurialweb.css
--- a/themes/mercurialweb/static/style-mercurialweb.css	Fri Jul 16 01:21:02 2010 +0200
+++ b/themes/mercurialweb/static/style-mercurialweb.css	Mon Oct 25 01:20:36 2010 +0200
@@ -420,3 +420,32 @@
 
     font-size: 120%;
 }
+
+/* Graph views. */
+
+div.graph {
+    position: relative;
+}
+
+ul.graph {
+    list-style: none;
+    padding: 0;
+}
+
+.graphlabel {
+    white-space: nowrap;
+}
+
+.graphcolour-1 { fill: #d00; }
+.graphcolour-2 { fill: #dd0; }
+.graphcolour-3 { fill: #0d0; }
+.graphcolour-4 { fill: #0dd; }
+.graphcolour-5 { fill: #00d; }
+.graphcolour-6 { fill: #d0d; }
+
+line.graphcolour-1 { stroke: #d00; stroke-width: 0.1; }
+line.graphcolour-2 { stroke: #dd0; stroke-width: 0.1; }
+line.graphcolour-3 { stroke: #0d0; stroke-width: 0.1; }
+line.graphcolour-4 { stroke: #0dd; stroke-width: 0.1; }
+line.graphcolour-5 { stroke: #00d; stroke-width: 0.1; }
+line.graphcolour-6 { stroke: #d0d; stroke-width: 0.1; }
diff -r 7e8dc67bc2a1 -r a19ba5e3e9f0 themes/mercurialweb/summary.tmpl
--- a/themes/mercurialweb/summary.tmpl	Fri Jul 16 01:21:02 2010 +0200
+++ b/themes/mercurialweb/summary.tmpl	Mon Oct 25 01:20:36 2010 +0200
@@ -14,7 +14,7 @@
     ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li
     ><li><a href="{url}file{sessionvars%urlparameter}">Files</a></li
     ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&nbsp;<input name="rev" id="searchinput" type="text" size="20" />
+        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
       </span>
       {sessionvars%hiddenformentry}
       </form>
diff -r 7e8dc67bc2a1 -r a19ba5e3e9f0 themes/mercurialweb/tags.tmpl
--- a/themes/mercurialweb/tags.tmpl	Fri Jul 16 01:21:02 2010 +0200
+++ b/themes/mercurialweb/tags.tmpl	Mon Oct 25 01:20:36 2010 +0200
@@ -14,7 +14,7 @@
     ><li class="current"><span>Tags</span></li
     ><li><a href="{url}file{sessionvars%urlparameter}">Files</a></li
     ><li><form id="searchform" action="{url}log"><span class="container">
-        <span class="hint">Search</span>&nbsp;<input name="rev" id="searchinput" type="text" size="20" />
+        <span class="hint">Search</span>&#160;<input name="rev" id="searchinput" type="text" size="20" />
       </span>
       {sessionvars%hiddenformentry}
       </form>